git merge issue

welcome to shbcf.ru